bitkeeper revision 1.1217 (421485a7z8JARjjC9F7b0rTr-A1WOw)

Ensure watchdog disabled during fatal-error handling.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 341b7b5dd1ed912c1aecafbe3626e8c18bddb977..36280de46c06ac35241cf9e66c2e450e6ae70b4a 100644 (file)
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -108,6 +108,8 @@ asmlinkage void fatal_trap(int trapnr, struct xen_regs *regs)
         "machine check", "simd error"
     };
 
+    watchdog_on = 0;
+
     show_registers(regs);
 
     if ( trapnr == TRAP_page_fault )

diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index 9ddfa2e90a0f89d84712246c9f4804c9498939fc..a26f9d7121f7c698640ba830a04119858cdb1c4a 100644 (file)
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -598,6 +598,7 @@ void panic(const char *fmt, ...)
 
     debugtrace_dump();
 
+    watchdog_on = 0;
     mdelay(5000);
     machine_restart(0);
 }

diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h
index 8d26e0ddbec8ee602da722bd31a3ab18ea62bc5a..c335a04d15b7bfb3af9396cd614334a0c6fac2fa 100644 (file)
--- a/xen/include/xen/lib.h
+++ b/xen/include/xen/lib.h
@@ -8,7 +8,6 @@
 
 #define BUG() do {                                     \
     printk("BUG at %s:%d\n", __FILE__, __LINE__);      \
-    debugtrace_dump();                                  \
     FORCE_CRASH();                                      \
 } while ( 0 )